From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 29 Jan 2010 11:13:16 +0000 (-0500)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5232^2~20
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6e7d621c18f9645c886c0bb4fac69ec5c9c1fd12;p=emacs.git

Merge from mainline.
---

6e7d621c18f9645c886c0bb4fac69ec5c9c1fd12